From 56ddd3a48ea63a79e1372dacac53fee8aada1bf0 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 24 Jun 2025 11:14:41 -0400 Subject: [PATCH] prepare-root: Don't hardcode sysroot Follow to previous change to factor out composefs mounting; prep for soft reboots. Signed-off-by: Colin Walters --- src/libotcore/otcore-prepare-root.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libotcore/otcore-prepare-root.c b/src/libotcore/otcore-prepare-root.c index 01acf5cf..fa990dec 100644 --- a/src/libotcore/otcore-prepare-root.c +++ b/src/libotcore/otcore-prepare-root.c @@ -375,7 +375,8 @@ otcore_mount_composefs (ComposefsConfig *composefs_config, GVariantBuilder *meta if (composefs_config->enabled == OT_TRISTATE_NO) return TRUE; - const char *objdirs[] = { "/sysroot/ostree/repo/objects" }; + g_autofree char *sysroot_objects = g_strdup_printf ("%s/ostree/repo/objects", root_mountpoint); + const char *objdirs[] = { sysroot_objects }; struct lcfs_mount_options_s cfs_options = { objdirs, 1, -- 2.30.2